From: Jo-Philipp Wich Date: Sat, 3 Jul 2021 05:20:30 +0000 (+0200) Subject: Revert "luci-mod-network: issue with breakdown of dnsmasq after duplication of static... X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=afea1dac74b7d423233621c027ab3b510fb61338;p=project%2Fluci.git Revert "luci-mod-network: issue with breakdown of dnsmasq after duplication of static IP was fixed" This reverts commit 463e910119813aaea0755ff5c16c91ce412a8cbb. This change causes the entire static lease to get deleted when attempting to change the MAC address. Signed-off-by: Jo-Philipp Wich (cherry picked from commit 91f46d765b36825fcfe63e2b7d4863de00cdc69d) --- diff --git a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js index 4dd90cc326..c5700a822c 100644 --- a/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js +++ b/modules/luci-mod-network/htdocs/luci-static/resources/view/network/dhcp.js @@ -473,25 +473,6 @@ return view.extend({ so.value(mac, hint ? '%s (%s)'.format(mac, hint) : mac); }); - so.write = function(section, value) { - var ip = this.map.lookupOption('ip', section)[0].formvalue(section); - var hosts = uci.sections('dhcp', 'host'); - var section_removed = false; - - for (var i = 0; i < hosts.length; i++) { - if (ip == hosts[i].ip) { - uci.set('dhcp', hosts[i]['.name'], 'mac', [hosts[i].mac, value].join(' ')); - uci.remove('dhcp', section); - section_removed = true; - break; - } - } - - if (!section_removed) { - uci.set('dhcp', section, 'mac', value); - } - } - so = ss.option(form.Value, 'ip', _('IPv4-Address')); so.datatype = 'or(ip4addr,"ignore")'; so.validate = function(section, value) {